From: Florian Müllner <fmuellner@gnome.org>
Date: Thu, 24 Apr 2014 14:20:01 +0000 (+0200)
Subject: environment: Be more careful when hooking up style properties
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2524
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=3969be38bd7aae6531d210ea5884a61ff629badd;p=gnome-shell.git

environment: Be more careful when hooking up style properties

Sometimes it is more appropriate to set layout properties that are
hooked up to CSS properties in code. However this is currently not
possible, as we end up setting properties to 0 when not found in CSS;
be a bit more careful when hooking up CSS properties to support this.

https://bugzilla.gnome.org/show_bug.cgi?id=728897
---

diff --git a/js/ui/environment.js b/js/ui/environment.js
index cb286d5bd..3144ec686 100644
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@@ -47,8 +47,11 @@ function _patchLayoutClass(layoutClass, styleProps) {
         layoutClass.prototype.hookup_style = function(container) {
             container.connect('style-changed', Lang.bind(this, function() {
                 let node = container.get_theme_node();
-                for (let prop in styleProps)
-                    this[prop] = node.get_length(styleProps[prop]);
+                for (let prop in styleProps) {
+                    let [found, length] = node.lookup_length(styleProps[prop], false);
+                    if (found)
+                        this[prop] = length;
+                }
             }));
         };
     layoutClass.prototype.child_set = function(actor, props) {